Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

5282 locationpicker #5391

Merged
merged 2 commits into from
Jun 17, 2016
Merged

5282 locationpicker #5391

merged 2 commits into from
Jun 17, 2016

Conversation

ivovandongen
Copy link
Contributor

Still need to squash the commits

@ivovandongen ivovandongen added the Android Mapbox Maps SDK for Android label Jun 17, 2016
@ivovandongen ivovandongen added this to the android-v4.1.0 milestone Jun 17, 2016
@zugaldia
Copy link
Member

Found a merge conflict while rebasing with platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java. Resolving now.

@zugaldia
Copy link
Member

CI is complaining in the javadoc phase.

:MapboxGLAndroidSDK:compileReleaseJavaWithJavac - is not incremental (e.g. outputs have changed, no previous execution, etc.).
/bitrise/src/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java:435: error: cannot find symbol
        marker.setDuration(duration);
              ^
  symbol:   method setDuration(long)
  location: variable marker of type MarkerView
/bitrise/src/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java:436: error: cannot find symbol
        marker.setStartTime(AnimationUtils.currentAnimationTimeMillis());
                            ^
  symbol:   variable AnimationUtils
  location: class MarkerViewManager
/bitrise/src/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java:437: error: cannot find symbol
        marker.setShouldAnimate(true);
              ^
  symbol:   method setShouldAnimate(boolean)
  location: variable marker of type MarkerView
/bitrise/src/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java:443: error: cannot find symbol
            marker.setAnimating(true);
                  ^
  symbol:   method setAnimating(boolean)
  location: variable marker of type MarkerView
/bitrise/src/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java:444: error: cannot find symbol
            PointF screenLocation = mapboxMap.getProjection().toScreenLocation(marker.getTargetPosition());
                                                                                     ^
  symbol:   method getTargetPosition()
  location: variable marker of type MarkerView
/bitrise/src/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java:448: error: cannot find symbol
            ObjectAnimator animatorX = ObjectAnimator.ofFloat(convertView, "x", screenLocation.x - marker.getOffsetX());
            ^
  symbol:   class ObjectAnimator
  location: class MarkerViewManager
/bitrise/src/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java:448: error: cannot find symbol
            ObjectAnimator animatorX = ObjectAnimator.ofFloat(convertView, "x", screenLocation.x - marker.getOffsetX());
                                       ^
  symbol:   variable ObjectAnimator
  location: class MarkerViewManager
/bitrise/src/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java:449: error: cannot find symbol
            ObjectAnimator animatorY = ObjectAnimator.ofFloat(convertView, "y", screenLocation.y - marker.getOffsetY());
            ^
  symbol:   class ObjectAnimator
  location: class MarkerViewManager
/bitrise/src/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java:449: error: cannot find symbol
            ObjectAnimator animatorY = ObjectAnimator.ofFloat(convertView, "y", screenLocation.y - marker.getOffsetY());
                                       ^
  symbol:   variable ObjectAnimator
  location: class MarkerViewManager
/bitrise/src/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java:450: error: cannot find symbol
            AnimatorSet set = new AnimatorSet();
            ^
  symbol:   class AnimatorSet
  location: class MarkerViewManager
/bitrise/src/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java:450: error: cannot find symbol
            AnimatorSet set = new AnimatorSet();
                                  ^
  symbol:   class AnimatorSet
  location: class MarkerViewManager
/bitrise/src/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java:453: error: cannot find symbol
            set.setDuration(marker.getRemainingTime());
                                  ^
  symbol:   method getRemainingTime()
  location: variable marker of type MarkerView
/bitrise/src/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java:454: error: cannot find symbol
            set.addListener(new AnimatorListenerAdapter() {
                                ^
  symbol:   class AnimatorListenerAdapter
  location: class MarkerViewManager
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: /bitrise/src/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java uses unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
13 errors
:MapboxGLAndroidSDK:compileReleaseJavaWithJavac FAILED

@cammace could I have your 👀 here?

@ivovandongen
Copy link
Contributor Author

@zugaldia Started over with local state. Squashed into 2 commits now, one for #5282 and one for #5384

@zugaldia zugaldia merged commit a2dbec8 into release-android-v4.1.0 Jun 17, 2016
@zugaldia zugaldia deleted the 5282-locationpicker branch June 17, 2016 18:26
@zugaldia
Copy link
Member

@ivovandongen Merged. Thanks for sorting this up.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Android Mapbox Maps SDK for Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants